Merge commit 'origin/master'
authorDavyd Madeley <davyd@madeley.id.au>
Tue, 19 May 2009 07:32:10 +0000 (15:32 +0800)
committerDavyd Madeley <davyd@madeley.id.au>
Tue, 19 May 2009 07:32:10 +0000 (15:32 +0800)

Trivial merge